Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Room call push rule should be an underride, not an override. #3185

Merged
merged 1 commit into from
Mar 3, 2023
Merged

Room call push rule should be an underride, not an override. #3185

merged 1 commit into from
Mar 3, 2023

Conversation

clokep
Copy link
Member

@clokep clokep commented Mar 2, 2023 •
edited by github-actions bot
Loading

#3181 added some tests which broke when #3179 merged in develop; I'm not really sure why that broke things, but it seems to be something about overriding the matrixClient.pushRules.

Anyway, consistently using this push rule as an underride rule, which is how it is already defined (and how MSC3914 defines it) fixes it:

matrix-js-sdk/src/pushprocessor.ts

Lines 92 to 110 in 933a0c9

const DEFAULT_UNDERRIDE_RULES: IPushRule[] = [
{
// For homeservers which don't support MSC3914 yet
rule_id: ".org.matrix.msc3914.rule.room.call",
default: true,
enabled: true,
conditions: [
{
kind: ConditionKind.EventMatch,
key: "type",
pattern: "org.matrix.msc3401.call",
},
{
kind: ConditionKind.CallStarted,
},
],
actions: [PushRuleActionName.Notify, { set_tweak: TweakName.Sound, value: "default" }],
},
];

Checklist

  • Tests written for new code (and old code if feasible)
  • Linter and other CI checks pass
  • Sign-off given on the changes (see CONTRIBUTING.md)

This change is marked as an internal change (Task), so will not be included in the changelog.

@clokep clokep changed the title Room call is an underride, not an override. Room call push rule should be an underride, not an override. Mar 2, 2023
@clokep clokep added the T-Task Tasks for the team like planning label Mar 2, 2023
@clokep clokep marked this pull request as ready for review March 2, 2023 18:53
@clokep clokep requested a review from a team as a code owner March 2, 2023 18:53
@t3chguy t3chguy added this pull request to the merge queue Mar 3, 2023
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to no response for status checks Mar 3, 2023
@t3chguy t3chguy added this pull request to the merge queue Mar 3, 2023
Merged via the queue into matrix-org:develop with commit c894d09 Mar 3, 2023
@clokep clokep deleted the fix-room-call-rule branch March 3, 2023 13:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@artcodespace artcodespace artcodespace approved these changes

@andybalaam andybalaam Awaiting requested review from andybalaam andybalaam is a code owner automatically assigned from matrix-org/element-web-reviewers

Assignees
No one assigned
Labels
T-Task Tasks for the team like planning
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@clokep @artcodespace @t3chguy